NetworkMenu: use the carrier state to the decide if wired should be shown

The design says "when a network cable is connected", not
"When a network cable is connected and the link is up and we
have an IP etc. etc." (which is what ACTIVATED would imply).

https://bugzilla.gnome.org/show_bug.cgi?id=723570

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 5c43ed3b5857721a5873f6544e220c797e20dd77..1d6d7c5646720a89a4eb39feb1457e00a50ddd2e 100644 (file)
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -432,16 +432,15 @@ const NMDeviceWired = new Lang.Class({
         this.item.menu.addMenuItem(createSettingsAction(_("Wired Settings"), device));
     },
 
-    _isConnected: function() {
-        if (!this._device.active_connection)
-            return false;
-
-        let state = this._device.active_connection.state;
-        return state >= NetworkManager.ActiveConnectionState.ACTIVATING;
+    _hasCarrier: function() {
+        if (this._device instanceof NMClient.DeviceEthernet)
+            return this._device.carrier;
+        else
+            return true;
     },
 
     _sync: function() {
-        this.item.actor.visible = this._isConnected();
+        this.item.actor.visible = this._hasCarrier();
         this.parent();
     },